From b541825ef4c1e2cb90bf21d3ea66d86c645e4604 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 28 Jan 2009 19:01:42 +0000 Subject: [PATCH] (ls-lisp-classify): Propertize file name before concatenating the type indicating character. (ls-lisp-format): Don't propertize file-name if ls-lisp-classify already did. --- lisp/ls-lisp.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 7c9c9e61688..0374b9bbaed 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -531,13 +531,17 @@ for directory, string (name linked to) for symbolic link, or nil." (type (cadr filedata))) (cond (type (cons - (concat file-name (if (eq type t) "/" "@")) + (concat (propertize file-name 'dired-filename t) + (if (eq type t) "/" "@")) (cdr filedata))) ((string-match "x" (nth 9 filedata)) (cons - (concat file-name "*") + (concat (propertize file-name 'dired-filename t) "*") (cdr filedata))) - (t filedata)))) + (t + (cons + (propertize file-name 'dired-filename t) + (cdr filedata)))))) (defun ls-lisp-extension (filename) "Return extension of FILENAME (ignoring any version extension) @@ -632,7 +636,9 @@ SWITCHES, TIME-INDEX and NOW give the full switch list and time data." " " (ls-lisp-format-time file-attr time-index now) " " - (propertize file-name 'dired-filename t) + (if (not (memq ?F switches)) ; ls-lisp-classify already did that + (propertize file-name 'dired-filename t) + file-name) (if (stringp file-type) ; is a symbolic link (concat " -> " file-type)) "\n" -- 2.30.2